fix merge bug for trimaran peaks #928
Merged
+1
−1
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
k8s-ci-robot
added
release-note-none
k8s-ci-robot
added
the
size/XS
✅ Deploy Preview for kubernetes-sigs-scheduler-plugins canceled.
|
Merged
googs1025
reviewed
Aug 11, 2025
| } | ||
| assert.ElementsMatch(t, tt.expected, actualList) |
k8s-ci-robot
added
the
lgtm
googs1025
approved these changes
Aug 11, 2025
|
/approve looks straightforward. Good catch @googs1025 ! |
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: ffromani, googs1025, kannon92 The full list of commands accepted by this bot can be found here. The pull request process is described here
Needs approval from an approver in each of these files:
Approvers can indicate their approval by writing |
k8s-ci-robot
added
the
approved
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
What type of PR is this?
/kind cleanup
What this PR does / why we need it:
During the 1.33 dependency bump, @googs1025 called out a bad change.
Which issue(s) this PR fixes:
Fixes #
Special notes for your reviewer:
ref: #917 (comment)
Does this PR introduce a user-facing change?